Merge "Ensure shortcuts show up in widget picker screenshot test" into main