Merge "gadget: composite: Undo revert of 9e878a6bfa9e1cf70cf77caeca60a0465d77954b"