Merge "Use cached launcher shelf KCA before entering PiP" into main