am 44fc8d5e: Merge "Add media directory, hidden for now." into jb-dev

* commit '44fc8d5e20a7b202a7916bfa56a2b91c33e605c2':
  Add media directory, hidden for now.