Merge "Respect rounded.xml size in ScreenDecorations" into rvc-dev am: 99596c6c69 am: 4c06ad37c9 am: 8714436182 am: 62e4a8ecf0

Change-Id: Ide3924b3574401181178389f28b2d0739252568e