Merge "Fix bug 5060033 - No text-editing toolbar when in a dialog"