Merge "Ensure transition is ready after applying display change"