Merging from ub-launcher3-master @ build 6294827 am: 8674a882f6

Change-Id: I664e99634eea6caacb6d9fdad18024a68573b6c3