Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-v2-dev