Merge "aconfig storage daemon: add local override removal capability" into main