Merge "Skip entering PIP when dismissing auto-enter pip task" into sc-v2-dev