Merge "Improve PIP enter transition w/ gesture nav (2/N)"