Merge "Revert^2 "Migrate audio permission provider prop listener"" into main