Merge "Reduce flicker when resize animation" into tm-dev