Merge "Add pixel scaling to ScreenDecorationUtils" into main