Merge "Add more functionality for some picker fakes" into main