am 6a82ccbc: (-s ours) am 85978d7c: am a3234f01: am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev

* commit '6a82ccbce945fc52bdc35b1cf7661e138feeec2d':
  DO NOT MERGE: Reduce delay of floating toolbar appearance.