[automerger skipped] Merge "Avoid using usap when wrap property set." into qt-dev am: cbd4908c
am: 9ab82236 -s ours
am skip reason: change_id I5f25030ce8e667d175712796c0950f38baa2532d with SHA1 6db1108d is in history
Change-Id: I1ba76a87eaaad1ff601c58d3018786e0b2e1c1bd