Merge "Defer launching next task until after first layout." into nyc-mr1-dev