Merging from ub-launcher3-master @ build 6538369 am: 741fbf67bc

Change-Id: I5260541a9df1bc1f2588ec858d9e56d097d8c50a