Merge "Fix flicker when starting folding" into tm-qpr-dev