Adjusted some comments and added some ideas for cleaning up media key
handling on kitkat