Merge "Don\'t persist selection after restore." into nyc-dev
am: 522a437786

* commit '522a4377863339d9486c833f5a39f8047576bfee':
  Don't persist selection after restore.

Change-Id: Idee08d4397212a2a2a58b650ebcaa3b162b73aab