Merge "RemoteAnimations: Add failsafe" into pi-dev