Merge "Remove secure_window_state flag" into main