Merge "Don't backup/restore ringer mode" into klp-dev