Merge "Fixing issue incorrect resources being used with docked windows."