am 8e1cf18f: am 1fa8290d: Merge "Fix FloatingToolbar flicker in reaction to...
am 8e1cf18f: am 1fa8290d: Merge "Fix FloatingToolbar flicker in reaction to text cursor blink." into mnc-dev
* commit '8e1cf18f':
Fix FloatingToolbar flicker in reaction to text cursor blink.