Merge "Set display change ready only if no one sets"