Merge "Merge "Reset Cards as they come into view" into nyc-dev am: 4fd98d1f...
Merge "Merge "Reset Cards as they come into view" into nyc-dev am: 4fd98d1f am: e257f579" into nyc-mr1-dev-plus-aosp
am: 4f7e8055
* commit '4f7e8055':
Change-Id: I7cbb988ce155dcf56b37a008a19b7cf21ab1d722