Merge "Pass ActivityOptions back from finishing activity."