Merge "Resource shared libraries: fix theme references" into nyc-dev