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

Change-Id: I71580408161853105947dc650e8e9bbdbf34f8cd