Merge "Defer destroying surfaces until not current" into jb-mr2-dev