* commit 'a490bddc8bf0812973dee34ead5c04c87e7ecb15': Make getMediaStorageDirectory() user-aware. Lockdown should only augment connected networks.
* commit 'a490bddc8bf0812973dee34ead5c04c87e7ecb15': Make getMediaStorageDirectory() user-aware. Lockdown should only augment connected networks.