Merge "Fix black screen while animating a closing and changing TF" into tm-qpr-dev