Merge "Cleanup hide_pointer_indicators_for_secure_windows flag" into main