Merge "Fix NPE in StatusBar#onBackPressed()"