Merge branch 'ub-launcher3-dorval' into launcher3merge

Test: testing done on ub-launcher3-dorval branch
Change-Id: I3e5167b7e1944ca259747caa8fd56a0507742dfc

issue 62484015