Merge "Update screen bounds calculation for SpectatioUiUtil" into main