pr-13134-2cab85 vs. 2409-189 / sw-lin-mesa / sms-bubbles

pr-13134-2cab85 (2cab85f1) Diff 2409-189 (21f43193)
209e4d7c01cdb8a22510ad7f3d6b0455ec3424c3 Waiting for diff... 14a2a4c8213dd8b92e449bd2e5b0fb4245857368
371c4582e158851f07a5e901d3871b250e7a9fed Waiting for diff... aed6b1f69e7b19ddb65f231765e1f2f566e5c61d