am 29cfce7a: Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev

* commit '29cfce7a387c5f1ea92a310398ed4ed213a3cf62':
  Making sure to clear state related to views that are being recycled (issue 7650538)