Merge "Revert "Add Extra Parameter for Intent""