Merge "Settings: Add settings for MountService prefs and bump DB version to 46"