Merge "system_server: route flag server/local override requests to new storage" into main