Merge changes I9881453b,I57fa88c6

* changes:
  Don't set background color if TDA doesn't have a valid surface
  Use TDA for background color instead of new color layer