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