Merge "Run surface placement at the end of display change" into 24D1-dev