Merge "Defer addAutopromoteOnceGroups to transaction idle"