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

Change-Id: I391b9b32d6054185170fbb8f5efeb6767a02a37e