Merge "Remove no-longer-necessary robolectric check" into main