Merge "Respect rounded.xml size in ScreenDecorations" into rvc-dev