Merge "Add get-disabled shell command to locksettings"