Merge "Update QS top padding to use centralizedStatusBarHeight refactor" into main