[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev am: fd48588768 -s ours
am: 290fb2fdc4 -s ours
am skip reason: change_id Ic271a6a0f0803941dd5a84124dabf4d8c5fcc755 with SHA1 06b770cf14 is in history

Change-Id: I69dad191b81cb47b109935b14b84156c69f7fac1