Merging ub-launcher3-master, build 5358885

Test: Manual

Bug: 112934365
Bug: 123900446

Change-Id: I79335da22c872a59bf0238d478943eb6a5a04a23