Retry media selection addition. Some fixes
Removed change media selection action