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

Change-Id: I45f4094fad8e3e1e8562b0274db794c70a40b387