Merge "Additional null-checks for animations in case child views are removed at an inopportune time." into rvc-dev