Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev