Merge "Delete code that became dead after moving tests to robolectric" into ub-launcher3-master