Revert "Start drawing immediately"

This reverts commit 3127c2a471dbefda916701d9b3837ce109ea7d49.

The original CL caused various issues for which we don't have the
time/not willing to take the risk.

Bug: 27864389
Bug: 27451341
1 file changed