Merge "Customize ChooseLockGeneric SUW options" into udc-dev