Merge "Update display after it gets disabled" into main