Merge "Add strings for active unlock in settings"