Merge "Per-app media directories on external storage." into lmp-preview-dev