Merge "Fix regression for enter PIP when onUserLeaveHint"