Merge "Add delayed writing for RoleUserState."