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

* commit '9e3ed23fd01f7e85d9fbcfcad4ef2b68f72e2274':
  Don't persist selection after restore.

Change-Id: I1b9beb7ab84c8bba9d94f388234235b1ad7c565d