Merge "Migrate GridOccupancyTest to Robolectric" into ub-launcher3-master