Merge "Disable PiP entry when switching tasks via recents" into tm-dev