Merge "Update System UI to use theme colors." into nyc-mr1-dev