Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev