Merge "Fix black frame when unfold animation starts" into tm-qpr-dev