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

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