Merge "Cleanup flag "remove_on_window_infos_changed_..."" into main