Merge "Revert "start aconfig storage daemon"" into main