Merge "Remove portrait flag from handoff activity." into sc-v2-dev