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

Change-Id: I62da9e8c0c5eb1d7b9221c5a869ff2a39ce947c8