Merge "Add non-UI listener to media changes" into main