Merge "Fix test bug where launcher throws NPE because it isnt loaded yet." into ub-launcher3-master