Merge "Add config for showing/hiding emergency setting entry"