Merge "Finish Activity when account is changed"