[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev am: eac42583 -s ours
am: 82c74acc -s ours
am skip reason: change_id If2b813f24cf5998829fe417e32179c5e8283d308 with SHA1 0c47113a is in history
Change-Id: I21d24bebf7ddd951a4caced854e9b7087b82850f