Merge "Refctor DisplayController#handleInfoChange" into main