Merge "Add get-disabled shell command to locksettings" into oc-mr1-dev