Merge "Respect rounded.xml size in ScreenDecorations" into rvc-dev am: 99596c6c69

Change-Id: Ic6c33dc5b07dea84ca2ad6aa135e5e2c4d91985a