Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev