Merge "libgui: add layer_state_t::diff"