Merge "Improve ambient cue pills" into main