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