Merge "Ensure onDisplayChanged is always triggered" into main