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: 77199ad8
* commit '77199ad8':
Change-Id: Ia5df1ee06e14134b12a98393fa80f2967d8fd793