Merge "[Role Logic Move] Rename feature flag" into main