Merge "Store a wp GraphicBuffer pointer instead of an sp on LayerState" into sc-dev