Merge "Allow ActivityOptions remote animation override per-display remote animation." into sc-v2-dev