am cf068ba2: am 3ae8bf53: Merge "Change FloatingToolbar entry/exit animations to fadeIn/fadeOut." into mnc-dev

* commit 'cf068ba27d86289ed085da17a0536a4d3a5208e6':
  Change FloatingToolbar entry/exit animations to fadeIn/fadeOut.