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

Change-Id: I50ac2530716130cd5acda51ba045e4103dc493bd