Merge "Update mirror layer tests to support detach mirror flag" into main