Merging from ub-launcher3-master @ build 6356169 am: df83c9026d

Change-Id: I6448b5910886c479344c2d103e2d59ab5806b1cc