Merge change 24493 into eclair

* changes:
  Fix several issues in framebuffer_service