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