Merge "[Settings] Additional route for dismiss activity dialog"