Merge "Replace hard coded color with equivalent theme value." into nyc-dev