Merge "Revert f714906c for startActivityForResult" into sc-dev