Merge "Merge "Fixed an issue where the heads up were not rounded during bypass" into sc-dev am: a2c2bfde am: 0d57b0bb" into sc-v2-dev-plus-aosp