Merge "DO NOT MERGE Put a small sleep back in the start of toolbox top." into nyc-mr2-dev