Merge "Avoid throwing when 0 size layer requested" into nyc-mr1-dev