Merge "Add isActiveUnlockRunning" into udc-dev