Merge "Fixing some robolectric tests" into ub-launcher3-master