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

Change-Id: I59c771771dba197c9370cceed7f832d1d2f3b1e7