Merge "Fix InvalidDisplayException on display removal for visible background users" into main