Merge "[automerger skipped] Merge "Fix entering PiP transition in button navigation mode" into sc-dev am: 73ef335c am: fcdb6289 -s ours" into sc-v2-dev-plus-aosp