Merge "Remove remove_input_channel_from_windowstate flag" into main