Add both variants of media profiles
Fix typo
Merge remote-tracking branch 'Quarx/cm11.0-2.6.32' into slim4.4