Merge "Update bundle ClientTransaction flags" into main