Support Matter for save-for-later feature