Merge "Ensure consistent attach/detach callback on transient view"