Merging from ub-launcher3-master @ build 6294827 am: 8674a882f6 am: 6b9d3c4a06 am: 080fda0b66 am: d12ce8f493

Change-Id: I3f87e1def941d0b542965e1d668520532903082e