Merge "dvrapi: Pass layer_count down" into oc-dev