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

Change-Id: I49c17b56bd649ba16653c5258983cb1f06ca45c4