Merge "Updating Robolectric tests" into ub-launcher3-master