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

Change-Id: I53060e15fa1299efe3ab162543aae75dfae61021