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