Merge "Fix bug 5228657 - Input method window rendered with titlebar"