Merge "Added temporary-lockout timer support" into udc-qpr-dev