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