Merge "Do not show PipMenuActivity during expansion" into rvc-dev