e1006c8395
* Variables: Confirms selection before opening new picker
* Tests: fixes e2e tests
(cherry picked from commit 6087980de0)