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

Change-Id: I43014b9a12d344d2877c85f4689c73097aaffbfa