Merge "Close searchActivity doesn't go back to previous activity"