Merge "Use Activity resources in DecorContext" into nyc-dev