Merge "Fix race condition when destroying view" into oc-dr1-dev