Merge "Make sure to reset isFoldHandled" into tm-qpr-dev