Merging from ub-launcher3-master @ build 6369897 am: 884f8f217f am: d3ba747e6d am: d5e144463f

Change-Id: Ie4eaa87436f1186872f12fdb87040911d0b0142a