Simplified media command handling in KitKat
Condensed pre-KitKat setup code into a single if block