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