Merge "Account for system scale before calculating preview scale" into main