Merge "Only classify text when the toolbar is shown." into oc-dev
am: a20b6ba1f2

Change-Id: I94619c59f052a170c3b40d8de25a5c6f7a71fa85