Merge "MountService: Add support for renaming secure containers"