Merge "Register FlagManager as a System Service" into main