Merge "Synchronize broadcasts so that beginBroadcast does not get called twice" into udc-dev