Merge "Remove unused messages 'resetprefs' and 'timezoneoffset'"