Merge changes from topic 'single_buffer_mode'

* changes:
  SF: Force refresh when in single buffer mode
  BQ: Add support for single buffer mode