Merge "Implement long sleep for VVM task scheduler" into nyc-mr1-dev