am c93af6dc: Merge change 7441 into donut

Merge commit 'c93af6dc5bc78f02d4ee549890da12dc669fc2fe'

* commit 'c93af6dc5bc78f02d4ee549890da12dc669fc2fe':
  Allow system colors in <font> tags