Merge "Moving some tests to robolectric" into ub-launcher3-master