Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev