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