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