Merge branch 'ub-launcher3-master' into launcher3merge2018-11-08

Test: Manual
Change-Id: I0e6c8354531da53a335b2ec3a7f322c2fb40b0c7