Merge "Introduce onNewActivityOptions for return activity"