Merge "Do not recompute display config if its config frame is not changed" into main