Merge "Don't moveToRestState from onTaskAppeared" into tm-qpr-dev