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

* commit 'be58946330c918f7912ff318030f99acb25e6098':
  Only change picker modes when used in dialog

Change-Id: I9900c12d284d353d491f3e4e3d299c2682761221