Merge "Strip transition information from activityoptions once it is read." into sc-v2-dev