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

Change-Id: I37dbd6e48bba06ba327449a20699779ecc489bdc