Merge "Polish the PipMenuView when showing the controls" into sc-dev