Merge "Cancel unfold animation when rotation changes" into tm-qpr-dev