Merge "Fix crash when no StatusBarView" into oc-dr1-dev
am: c424b22979

Change-Id: I3edd2863863cd39dc125e7f1801ea328acf0fe9c