Merge "Rebuild outline when setBackground is called." into nyc-dev
am: 7fb0d09

* commit '7fb0d094559b9ae431c3b520721ebdb3c111c4c2':
  Rebuild outline when setBackground is called.