Merging from ub-launcher3-qt-qpr1-dev @ build 5834630 am: 151970d535
am: b6d7a85a2b

Change-Id: If79242dd021c9a2c3fa6e1a87a5c8d792e45dc1a