Merge "Update display after it gets disabled" into 24D1-dev