am a1c3681f: am decc139b: Merge change I7a824efc into eclair

Merge commit 'a1c3681fb84e9baa3055709a18c635dc77c1b041' into eclair-mr2-plus-aosp

* commit 'a1c3681fb84e9baa3055709a18c635dc77c1b041':
  Support applications changing the surface attached to the RS.