Merge "Fix the round corner and crop issue after auto-enter-pip" into sc-dev