Merge "Make InputWindow.h's window types align with WindowManager.java's."