Merge "Save Layer instead of Handle to LayerCreatedState"