Merge "Fix dialog flicker when onDisplayChanged is received" into main