[automerger skipped] Merge "DO NOT MERGE Respect rounded.xml size in ScreenDecorations" into qt-qpr1-dev am: 688ebd6876 -s ours am: 547ddb0e60 am: f4133ec26c
Change-Id: I40287d8bc006408137ae272b331c909ce36ef518
This commit is contained in: