Merge "Fix hint text updates in Extracted text mode"