Merging from ub-launcher3-master @ build 6269120 am: 39eaaeb892

Change-Id: Ic6dbcf1058e83a88561a342a8ef3c026948507fd