Merge "Fix NPE in StatusBar#onBackPressed()" am: 6cfa7f2fee
am: 10379e1f17

Change-Id: Ie4db309fc0c75b0e5c9195cf1797abffd2c8a58c