Merge "Fix for AOOB in MeasuredText"