Merge "Only change picker modes when used in dialog" into nyc-dev