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

Change-Id: I852da9ec9bff784d937ef5ea5fd4ba9c00edba07