Merge "Revert "Call dispatchFinishTemporaryDetach before returning a transient view"" into mnc-dev