Merge "Add strings that will be needed for screen saver settings"