Merge "Pass system layers through chain." into nyc-dev