Merge "Fixed an issue where the heads up were not rounded during bypass" into sc-dev