Merge "Ensure views are inflated before trying to animate." into rvc-dev