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

Change-Id: I0f12bda69956581e5cf8b0575b903133f34e03b1