Merge "Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev am: 5a590720" into sc-mainline-prod