Merge "Add pixel scaling to ScreenDecorationUtils" into 24D1-dev