Merge "Synchronize device state update and display update callbacks" into udc-dev