Fixes #10157 We realistically only ever use the picker in contexts where we later confirm or cancel with the selected value, so this is fine. If the caller wants to ignore the initial value, they can always check if it's distinct before/after there. (cherry picked from commit 60150423d7771d9317883e1e2a26a59fba886a72)