Merging from ub-launcher3-master @ build 6356169 am: 3ca049371b

Change-Id: Iae61410a565d87ae191d1d63255cef9351cfdea6