Merge "Connected displays wait for boot complete" into main