Merging from ub-launcher3-master @ build 6294827 am: 8674a882f6 am: c93476608e am: 33bdbef20f am: d8ddbb3d09

Change-Id: Ib9712f045e1e89cde062f5d186c93d6bd9447269