Merging from ub-launcher3-master @ build 6269120 am: 8f03c5c1ce am: c8afd01801 am: ebd0906a4e am: 558f731204

Change-Id: I43fbcfa1de5eda2c2c8b5245e9b3c333bbfbbb44