Merge "rename emergency tone settings"