Merge "Fix flicker with remote animations"