Merge branch 'ub-launcher3-master' into master

Test: flashed img
Change-Id: Ida66cfde3952a4a924f38811823474ca448a7dc0