Merge "Moving come tests to Roboelectric" into ub-launcher3-master