Correctly handle being disabled before being enabled.

Authored by markwei on May 3 2017, 7:31 PM.

Description

Correctly handle being disabled before being enabled.

Reviewers: O2 Material Motion, O6 Material Android platform reviewers, Material Motion, randcode-generator

Reviewed By: randcode-generator

Tags: Material Motion

Differential Revision: http://codereview.cc/D3158