Merge "Implement btn nav auto enter pip2 flow 1/3" into main