Merging from ub-launcher3-master @ build 6356169 am: df83c9026d am: d503307722 am: 05201fb66c am: 0d67d1d3b2

Change-Id: I0169fb22de3e549cc8bafa877ef6a220a216b96c