Merge "Guard app handle hiding on immersive changes behind a flag" into main