Merge "Step 4 from the plan below:" into ub-launcher3-master