Merge "Add missing 'pin' screen lock option" into oc-dr1-dev