Merge "Ensure that input is disabled when locked out." into udc-dev