Merge changes I0df55b11,I1cbeb477

* changes:
  Don't destroy preserved surfaces when cleaning up on resume.
  Don't limited pinned tasks to content area.