Merge "Revert "Fix flicker with remote animations""