Merge "Disabled bubble bar for the connected display." into main