am 685a1446: Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev

* commit '685a14468eeb730d19a36ac20bda75fe968feddb':
  Fix floating toolbar flicker in ExtractEditText mode.