Merge change Ifd71653f into eclair-mr2

* changes:
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs