Merge "Properly reject empty unclipped savelayers" into nyc-dev