Merge "Add a method to reset circular references in audio flinger service" into main