Merging from ub-launcher3-master @ build 6476761 am: b2c43c5cb1

Change-Id: Ia41b5f6c259b09239b261c8574780aecda6fe71e