Merge "Add sliders collapse/expand if the media session is playing" into main