Merge "Updating settings to use resource overlay instead of setting."