Merge "Unocclude immediately so that the surface animation is visible." into tm-dev