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