Merge "Process updates to ringer and audio sequentially" into main