Adding mount persistence to the media store mount method

Remove isn't called yet, so not going to worry about it for now.