Merge "Run surface placement at the end of display change" into main