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

Test: Tested on unbundled branch
Change-Id: Icf6beaf668feeb9d86d7fe3a7bcefdd16a15e9ac