Merging from ub-launcher3-master @ build 6248758 am: 4bff19c5df

Change-Id: I0d8dc9b4c8953b5876dee37bb6b5616bee14e807