Merge "Make the Settings permission a required module"