Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev