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

Change-Id: Idd6537cb09cba9bbca4588ecdfa831039cfd106c