Bug 1082936 - STK messages are seen overlapping each other. Patch v2.1
Merge pull request #25607 from mancas/bug1082936_v2.1

Bug 1082936 - STK messages are seen overlapping each other. Patch v2.1