Merge "Fix screenshot surface null during animation" into tm-qpr-dev