am b2e64cb8: am 0050ee36: Adopt new FastTrack API for internal widget, fix bugs.

Merge commit 'b2e64cb892d64af770b43a84b54ebfbca7c0c5e2'

* commit 'b2e64cb892d64af770b43a84b54ebfbca7c0c5e2':
  Adopt new FastTrack API for internal widget, fix bugs.