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

Change-Id: I67e0ca0dd05d4989f3883ad98ed4a9cc58266ee1