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