Merge "Handle defer transactions on a detached layer" into rvc-qpr-dev