Merge "Remove corner cutout tracking from HeadsUpStatusBarView" into sc-dev