Merge "Rebuild outline when setBackground is called." into nyc-dev