Merge "Remove Redundant Variable for getStatusBarHeightForRotation" into main