Merge "Add per-display RemoteAnimation overrides and flag to disable snapshots"