Layerstore refactor rw layer Upstream-commit: d08ac6e256933b50dc956abddac6d1fd5c750bf9 Component: engine