Merge "Cancel unocclude animation on main thread" into tm-qpr-dev