Merge "[Unfold transition] Do not play haptics when hitting a timeout on folding" into tm-qpr-dev