Merge "Reschedule timeout when accessibility event occurs" into udc-dev