Merging from ub-launcher3-master @ build 6269120 am: 8f03c5c1ce am: 8df766f1ba

Change-Id: I26b7956629d4afe63fc1085351472a024880533a