Merge "Fixes PiP transition with autoEnterPip in button nav" into sc-dev