Merge "Respect rounded.xml size in ScreenDecorations" into rvc-dev am: 99596c6c am: 4c06ad37 am: 87144361 am: 62e4a8ec Change-Id: Ide3924b3574401181178389f28b2d0739252568e