Merge "Fix animation video render issue when Settings->Moves is resumed from...
Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev am: b88068a8
am: 7822cb6d
Change-Id: If793369e690fa252431d73cd3443ae245dcf4c82