Merge "Fix crash when PhoneStatusBarView has no cutout"