Merge "Tool bar title updates wiht the selected option" into main