Merge "Merge existing bundle with ActivityOptions" into sc-dev