Merge "Add back @UnsupportedAppUsage in ClientTransaction" into main