Merging from ub-launcher3-master @ build 6356169 am: 3ca049371b

Change-Id: I9b59fc77f6809d09114a4b5ceb25bbc62511552a