Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev