Merge "Fix entering PiP transition in button navigation mode" into sc-v2-dev