Merge "Add test checking that empty layer doesn't draw anything on the screen" into nyc-dev