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

Change-Id: I57e3c07e9390203a6eb201a314f3887fa7a678cd