Merge "Revert "Move widget picker tests to Robolectric"" into main