Merge "libgui: remove dead code in layer state"