Merge "Do not show options if screen lock types is empty" into oc-dr1-dev