Merge media_control into main