Merge "Fixes autoEnterPip transition from landscape" into sc-dev