Merge "Allow overriding flags in Robolectric tests" into ub-launcher3-master