Merge "Implement manually entering PiP flow" into main