Merge "Added customizable default system theme." into nyc-mr1-dev