Merge branch 'ub-launcher3-master' into 'pi-dev'

Bug:77820223
Test: Manual Test on Walleye with PPR1.180409.001

Change-Id: Icb8f88611a1331fd126a4356f1b7fdcacc2e68ef