Merging from ub-launcher3-master @ build 6327709 am: 0997905b95

Change-Id: I6fbe4f8dc8c613090ac26ca5153762bc192afe6e