Merge changes I5e500724,I40cfb12c into nyc-dev
am: 0fb5135

* commit '0fb51357afb64a034a59f68a926f79d18213c72c':
  Restrict selection to 1000 items in DocumentsUI.
  Cancel band selection on directory change.

Change-Id: Id421aa25d0ad1e4134ecfeabd84aad801fdb4f13