Merge "Add settings UI for MANAGE_EXTERNAL_STORAGE"