Merge "Allow ActivityOptions remote animation override per-display remote animation."