Merge "Fix input window commands" into qt-dev