Merge "Add better configurability for dialog theme colours." into nyc-mr1-dev