Merge "Remove unused 'prefs-beta' message"