[automerger skipped] Merge "DO NOT MERGE Respect rounded.xml size in ScreenDecorations" into qt-qpr1-dev am: 688ebd6876 -s ours
am skip reason: subject contains skip directive

Change-Id: I0e6c482e042e14f1b1eddd284fbd7a98dca574ce