Merge "Revert transition codes from the base activity" into sc-dev