Merge "Update Modes List if modes change in the background" into main