Merge "UI for MANAGE_EXTERNAL_STORAGE: Add settings enums"