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

Change-Id: I197d45d0a274a68a17a3c8d83880d0a75a3b5456