Only change picker modes when used in dialog

Bug: 28444160
Change-Id: Ib8ced22272141cdf5f4c271c61cc8c6a83742ee4
4 files changed