Merging from ub-launcher3-qt-qpr1-dev @ build 5834630 am: 9ac4009346
am: b68df9438b

Change-Id: I1e7f39b9342f707d70ff2fc4e0ba05a97771b0c3