Merge "Support going home from immersive fullscreen in 3 button nav" into main