Merge "[Unfold animation] Restore clippings before clearing registered views" into tm-qpr-dev