Merge "Fix: [SystemUI] icon_blacklist is not reset for sub users"