Merge "Store display window settings per user to avoid conflicts." into main