Merge "Show bubble bar when hotseat icons are visible" into main