Merge "Let MtpDatabase add device name to storage root."