Merge branch 'ub-launcher3-master' into master

Test: flashed img
Change-Id: Ia7798bb4be28fd0e76eb36c26683e3ca4faeccee