Merge "Fix OffloadThread VolumeShaper issue"