Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53bbf am: aa65f36ffb am: a7d7e6fbd1"