Merge "Fix a status bar NPE in InputMethodManagerService" into nyc-dev