Merge "Corrected popup position in text decorator when grab handle is active" into...