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

* commit '1fa8290dbec37519576d346ba9ae8bbe20b64aa9':
  Fix FloatingToolbar flicker in reaction to text cursor blink.