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

Change-Id: I6e07dca79e8d33522d4f0e9b58dcc48bdff555d2