Merge "Commit draw state before computing whether display has content" into main