Merge "Fixing Robolectic tests" into ub-launcher3-master