Merge "Have WakeupMessage call Handler#dispatchMessage()" into nyc-mr1-dev