Merge "Ensure window with NO_INPUT_CHANNEL drops touches"