Merge "Ensure invalidate is called after start()/reverse()" into nyc-dev