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

Test: Tested on unbundled branch
Change-Id: Iaa4259a4b0c007a6f1ae1d16a658279568892622