Merge change I7a824efc into eclair

* changes:
  Support applications changing the surface attached to the RS.