Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53b am: e5a48c5b" into oc-mr1-dev-plus-aosp