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

Change-Id: Iad398ba0f768caed55b89b3391213c9dc1ebcb2e