Merge "Fix spring-loaded folder animation offset bug" into tm-qpr-dev