Merge "Fix null ActivityOptions when starting an Activity in a new Process."