Merge change I43723de2 into eclair

* changes:
  Avoid setting checked state when dismissing FastTrack.