Merge "Defer onTaskInfoChanged while transitioning to PiP" into sc-dev